Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add LICENSE-docs file #12

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

celestehorgan
Copy link

Per CNCF policy, Docs are licensed under CC-BY-4.0 while code is licensed under Apache 2.0.

This commit adds a LICENSE-docs file to the project, as well as a license footer to the README.md to resolve this issue. Most docs repositories are code+docs, so for the average docs repository both are needed.

This came about after a short discussion with @amye and @cra :)

Signed-off-by: Celeste Horgan [email protected]

Signed-off-by: Celeste Horgan <[email protected]>
@karenhchu
Copy link
Member

LGTM! Thanks for contributing this <3

Copy link
Contributor

@carolynvs carolynvs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

I know that none of my projects that I have worked on has done this. It may be worthwhile spreading the word a bit in the onboarding docs for the CNCF so that people are aware.

@carolynvs carolynvs changed the base branch from main to drafts June 22, 2021 19:59
@carolynvs carolynvs changed the base branch from drafts to main June 22, 2021 20:00
@carolynvs
Copy link
Contributor

/hold for TOC approval

@jberkus @idvoretskyi Saad had asked that we use our project board's TOC Approval column to identify items that needed approval before going live (in project-templates and on the website). Since the board is a repo board and not an org board, I can't add items from this repository to it. Can we create a board at the CNCF org level so that we can give the TOC a single place to look for items that need review?

@idvoretskyi
Copy link
Member

Ping @caniszczyk on the org-wide board question.

@celestehorgan
Copy link
Author

@carolynvs - I'm not sure what the plan is for older projects, so I wouldn't worry too much about your projects. We definitely want to do this for new projects going forward, however :)

@carolynvs
Copy link
Contributor

I just remembered that we can use "notes" on a project board and link to an issue in another repo. That seems like a totally workable way to do this without needing an org level project board. I've added this issue to the board.

# License
$PROJECT_NAME is licensed under an [Apache 2.0 license](./LICENSE).
The #PROJECT_NAME documentation is licensed under a [CC-BY-4.0 license](./LICENSE-docs).

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if referencing two different licenses in the same github repo could cause problems?

As far as I can tell each existing repo either selects Apache 2.0 or CC-by-4.0 based on if it is a code or docs repo.

Could we do something like

Suggested change
The #PROJECT_NAME documentation is licensed under a [CC-BY-4.0 license](./LICENSE-docs).
<!-- Select one of the below, based on if this is a code or docs repo. -->
$PROJECT_NAME is licensed under an [Apache 2.0 license](./LICENSE).
#PROJECT_NAME documentation is licensed under a [CC-BY-4.0 license](./LICENSE-docs).

And we have two files in our template LICENSE-apache and LICENSE-ccby40 and ask users to rename to LICENSE depending on the choice above?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A lot of projects have their docs in the same repository as their code and don't break them out separately until the project is large or has complex docs. I think it would help to give them 3 options: code only repo, docs only repo, or combined repo.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Options sounds good to me

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd rather have LICENSE-code and LICENSE-docs files, to remove any confusion

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think that works with GitHub's autodetection of a license though, which personally I would care about.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It doesn't work with it.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

GitHub now supports and reports multiple licenses when a project has more than one. For details, see Easily discover and navigate to multiple licenses in repositories.

I see that this PR has been superseded by more recent changes (so maybe it should be closed or reworked), but I thought that I'd mention the new GitHub feature anyway.

Over on https://github.com/open-telemetry/opentelemetry.io (which is a website repo), we have:

GitHub links to them both just fine:

image

/cc @nate-double-u @caniszczyk

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, that definitely helps with that.

@caniszczyk
Copy link
Collaborator

caniszczyk commented Aug 12, 2021 via email

@geekygirldawn
Copy link
Member

@caniszczyk @amye @TheMoxieFox Is this something that we should still merge? We're cleaning up a few old things, but this looks like something that we might actually want to merge?

@amye
Copy link

amye commented May 25, 2023

This is actually helpful!

# License
$PROJECT_NAME is licensed under an [Apache 2.0 license](./LICENSE).
The #PROJECT_NAME documentation is licensed under a [CC-BY-4.0 license](./LICENSE-docs).
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: line 46 we use $PROJECT_NAME and on line 47 we use #PROJECT_NAME

(we can merge this and open a fresh PR as well, not a blocker!)

Copy link
Contributor

@TheFoxAtWork TheFoxAtWork left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM - noting @dims comment for consistency.

@jberkus
Copy link
Collaborator

jberkus commented May 25, 2023

We should not merge this. As far as I know, there are still unresolved questions about it.

Specifically, cncf/foundation#230 is still unanswered.

@TheFoxAtWork
Copy link
Contributor

@jberkus thanks for the link - I'll elevate this at the next GB meeting if not sooner through other means.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs-toc-approval Requires approval from the TOC before merging to main
Projects
None yet
Development

Successfully merging this pull request may close these issues.